Support new staging account migration#1847
Merged
kborisov-ottofeller merged 6 commits intomainfrom Mar 30, 2026
Merged
Conversation
Add resolveKeyId() helper that resolves bare key IDs to full ARNs using KMS_LEGACY_ACCOUNT_ID env var. New keys store ARN instead of bare key ID. Backwards compatible — no-op when env var is unset.
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e5b7d9922a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Gr1dlock
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Type
Description
App-side changes for the devportal account migration (CORPLAT-689). The new staging runs in a separate AWS account but still depends on KMS keys and DNS that haven't moved yet. The corresponding infrastructure changes are here:PR 497
Changes
KMS cross-account resolution (
kms.ts,kms-eth.ts) — newresolveKeyId()turns bare key IDs into full ARNs whenKMS_LEGACY_ACCOUNT_IDis set, so the app in the new account can still use keys in the old one. Newly created keys are stored as ARNs from the start. No-op when the env var isn't set.Staging host check bypass (
utils.ts) — skip hostname validation whenNEXT_PUBLIC_APP_ENV=stagingsince we don't have the final custom domains yet. Prod is untouched. Tracked with a TODO for removal after DNS cutover.Test bucket name (
hasura/*.spec.ts) — stop hardcodingASSETS_S3_BUCKET_NAMEso the same tests work against both old and new staging buckets.Checklist